Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Nov 2011 08:45:58 +0000 (00:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 16 Nov 2011 08:45:58 +0000 (00:45 -0800)
commit2102b1f74b89cc94bacce580028cf154aa2f8c3b
tree9758069d5b3493a4d0053886e6d5cd31608dfda8
parentfce584d85b01675d8ec9fd947e7e25f8d876c5b3
parentc8ac456029ddbbe513d27df5a015fe82512b34fb
Merge from trunk.